Show correct size in the size entry.

2002-01-29  Anders Carlsson  <andersca@gnu.org>

	* gtk/gtkfontsel.c (gtk_font_selection_select_size): Show correct
	size in the size entry.

diff --git a/ChangeLog b/ChangeLog
index 386286da2f1ed8435c4517238ad08fd28a9b255a..4a193675cd5f7f2602f68a6fa73d0a0ee48efdca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-29  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkfontsel.c (gtk_font_selection_select_size): Show correct
+       size in the size entry.
+
 Tue Jan 29 16:11:55 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkfontsel.c (gtk_font_selection_show_available_sizes): Use

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 386286da2f1ed8435c4517238ad08fd28a9b255a..4a193675cd5f7f2602f68a6fa73d0a0ee48efdca 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2002-01-29  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkfontsel.c (gtk_font_selection_select_size): Show correct
+       size in the size entry.
+
 Tue Jan 29 16:11:55 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkfontsel.c (gtk_font_selection_show_available_sizes): Use

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 386286da2f1ed8435c4517238ad08fd28a9b255a..4a193675cd5f7f2602f68a6fa73d0a0ee48efdca 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-01-29  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkfontsel.c (gtk_font_selection_select_size): Show correct
+       size in the size entry.
+
 Tue Jan 29 16:11:55 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkfontsel.c (gtk_font_selection_show_available_sizes): Use

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 386286da2f1ed8435c4517238ad08fd28a9b255a..4a193675cd5f7f2602f68a6fa73d0a0ee48efdca 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-01-29  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkfontsel.c (gtk_font_selection_select_size): Show correct
+       size in the size entry.
+
 Tue Jan 29 16:11:55 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkfontsel.c (gtk_font_selection_show_available_sizes): Use

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 386286da2f1ed8435c4517238ad08fd28a9b255a..4a193675cd5f7f2602f68a6fa73d0a0ee48efdca 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-01-29  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkfontsel.c (gtk_font_selection_select_size): Show correct
+       size in the size entry.
+
 Tue Jan 29 16:11:55 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkfontsel.c (gtk_font_selection_show_available_sizes): Use

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 386286da2f1ed8435c4517238ad08fd28a9b255a..4a193675cd5f7f2602f68a6fa73d0a0ee48efdca 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-01-29  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkfontsel.c (gtk_font_selection_select_size): Show correct
+       size in the size entry.
+
 Tue Jan 29 16:11:55 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkfontsel.c (gtk_font_selection_show_available_sizes): Use

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 386286da2f1ed8435c4517238ad08fd28a9b255a..4a193675cd5f7f2602f68a6fa73d0a0ee48efdca 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-01-29  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkfontsel.c (gtk_font_selection_select_size): Show correct
+       size in the size entry.
+
 Tue Jan 29 16:11:55 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkfontsel.c (gtk_font_selection_show_available_sizes): Use

diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index 88eb915c284bd96b46512089a90ec49b147e2a79..3ecf53e14f97d82f8a5818fe6c89bf0ab5454e97 100644 (file)
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -901,6 +901,7 @@ gtk_font_selection_select_size (GtkTreeSelection *selection,
   GtkTreeModel *model;
   GtkTreeIter iter;
   gint new_size;
+  gchar buffer[128];
   
   fontsel = GTK_FONT_SELECTION (data);
   
@@ -913,6 +914,10 @@ gtk_font_selection_select_size (GtkTreeSelection *selection,
        {
          /* If the size was selected by the user we set the selected_size. */
          fontsel->size = new_size;
+
+         sprintf (buffer, "%i", fontsel->size / PANGO_SCALE);
+         gtk_entry_set_text (GTK_ENTRY (fontsel->size_entry), buffer);
+
          gtk_font_selection_load_font (fontsel);
        }
     }